From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 3 Jun 2014 12:52:18 +0000 (+0200)
Subject: ui: Adapt to display.get_tab_list API change
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2438
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f9df83802d13e02bcfc952725d6aa69767e99977;p=gnome-shell.git

ui: Adapt to display.get_tab_list API change
---

diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index 78773d931..fc7a558cc 100644
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -372,7 +372,7 @@ const WindowSwitcherPopup = new Lang.Class({
 
     _getWindowList: function() {
         let workspace = this._settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace() : null;
-        return global.display.get_tab_list(Meta.TabList.NORMAL, global.screen, workspace);
+        return global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
     },
 
     _createSwitcher: function() {
@@ -459,8 +459,7 @@ const AppSwitcher = new Lang.Class({
         let settings = new Gio.Settings({ schema: 'org.gnome.shell.app-switcher' });
         let workspace = settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace()
                                                                        : null;
-        let allWindows = global.display.get_tab_list(Meta.TabList.NORMAL,
-                                                     global.screen, workspace);
+        let allWindows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
 
         // Construct the AppIcons, add to the popup
         for (let i = 0; i < apps.length; i++) {
diff --git a/js/ui/ctrlAltTab.js b/js/ui/ctrlAltTab.js
index 199119707..570c73da3 100644
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -87,7 +87,7 @@ const CtrlAltTabManager = new Lang.Class({
         if (Main.sessionMode.hasWindows && !Main.overview.visible) {
             let screen = global.screen;
             let display = screen.get_display();
-            let windows = display.get_tab_list(Meta.TabList.DOCKS, screen, screen.get_active_workspace ());
+            let windows = display.get_tab_list(Meta.TabList.DOCKS, screen.get_active_workspace ());
             let windowTracker = Shell.WindowTracker.get_default();
             let textureCache = St.TextureCache.get_default();
             for (let i = 0; i < windows.length; i++) {